feat: Collection Atomic Swaps support #11319

hassnian · 2025-01-01T11:55:02Z

PR Type

Bugfix
Feature
Refactoring

Context

add: offers tab in collection
add: support for collection atomic swaps
- allows accepting an atomic-swap without a desiredItem
- adapt incoming trades query
Closes Incoming swaps and offers in profile sidebar #11334
Closes Redirect to a active offers from koda.art/swap page #11378
Ref Collection Atomic Swaps #11331
Ref Collection offer #11116

Screenshot 📸

My fix has changed something on UI;

Accept Collection Atomic Swap

Offer tab in Collection

Incoming Trades & Create swap tab

…n atomic swaps

netlify · 2025-01-01T11:55:23Z

✅ Deploy Preview for koda-canary ready!

Name	Link
🔨 Latest commit	`8d9d01a`
🔍 Latest deploy log	https://app.netlify.com/sites/koda-canary/deploys/67a1ab9ce87d8d00085bd9b4
😎 Deploy Preview	https://deploy-preview-11319--koda-canary.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

netlify · 2025-01-01T11:59:39Z

✅ Deploy Preview for polkadot ready!

Name	Link
🔨 Latest commit	`ec8f682`
🔍 Latest deploy log	https://app.netlify.com/sites/polkadot/deploys/677600011ca1b00008749aaa
😎 Deploy Preview	https://deploy-preview-11319--polkadot.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
Lighthouse	1 paths audited Performance: 15 Accessibility: 83 Best Practices: 83 SEO: 81 PWA: - View the detailed breakdown and full score reports

To edit notification comments on pull requests, go to your Netlify site configuration.

…ypes

# Conflicts: # components/trade/TradeOwnerButton.vue # components/trade/overviewModal/TradeOverviewModal.vue # composables/useIsTrade.ts

… open

# Conflicts: # composables/useTrades.ts

- ref: removed duplicate code

vikiival · 2025-01-27T14:48:26Z

can you please fix the conflicts @hassnian ?

# Conflicts: # components/common/ConnectWallet/WalletAssetMenu.vue

hassnian · 2025-01-28T08:06:25Z

can you please fix the conflicts @hassnian ?

done

hassnian · 2025-01-30T03:33:40Z

missing review @preschian @Jarsen136 , thanks

preschian

not tested, code lgtm

Jarsen136 · 2025-02-02T11:26:32Z

I'm not able to test it

vikiival · 2025-02-02T12:45:50Z

Cc @Jarsen136

https://deploy-preview-11319--koda-canary.netlify.app

Jarsen136 · 2025-02-02T13:05:48Z

Cc @Jarsen136

https://deploy-preview-11319--koda-canary.netlify.app

same

hassnian · 2025-02-03T06:46:11Z

Cc @Jarsen136
https://deploy-preview-11319--koda-canary.netlify.app

same

build is successful

@preschian any idea?

…item

vikiival · 2025-02-03T09:50:25Z

seems everything is failing rn

preschian · 2025-02-04T05:11:57Z

@preschian any idea?

@hassnian I have no idea for this one. I also sometimes face same issue. Commit empty message probably helps, to trigger again the builds

sonarqubecloud · 2025-02-04T05:55:21Z

Quality Gate passed

Issues
4 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

hassnian · 2025-02-04T06:20:20Z

@preschian any idea?

@hassnian I have no idea for this one. I also sometimes face same issue. Commit empty message probably helps, to trigger again the builds

yep, now everything is working

this preview link works https://deploy-preview-11319--polkadot.netlify.app/

cc @Jarsen136

Jarsen136 · 2025-02-04T08:56:20Z

@preschian any idea?

@hassnian I have no idea for this one. I also sometimes face same issue. Commit empty message probably helps, to trigger again the builds

yep, now everything is working

this preview link works https://deploy-preview-11319--polkadot.netlify.app/

cc @Jarsen136

This preview link still does not work perfectly. There are some CORS issues and the page does not load well. Is it time to reopen this issue? #11326 (comment)

https://deploy-preview-11319--polkadot.netlify.app

https://deploy-preview-11319--koda-canary.netlify.app/

preschian · 2025-02-05T12:30:33Z

@hassnian @Jarsen136 in the meantime, can we test it with this preview instead? https://hassnian-collection-atomic-s.kodaart-production.pages.dev/

on my case both of netlify pages return same error

preschian · 2025-02-06T09:01:11Z

Since we merged this PR, it seems all subsequent PRs fail deployment through Netlify. It seems like there's some limit on Netlify

I will try to check this one

add: offers tab in collections & init support for non specific toke…

7d3c2b5

…n atomic swaps

hassnian added 15 commits January 2, 2025 07:54

Merge branch 'main' into issue-11116

ec8f682

ref(useTrades.ts): cleaner subscribeToTargetsOfTrades with better t…

f113a09

…ypes

add(trades): search nft in collection input

400b9de

ref(transactionMintToken.ts): use isAssetHub util

80d782b

Merge branch 'main' into issue-11116

c3858b2

# Conflicts: # components/trade/TradeOwnerButton.vue # components/trade/overviewModal/TradeOverviewModal.vue # composables/useIsTrade.ts

Merge branch 'main' into issue-11116

39a4dac

fix(TradeOwnerButton.vue): button config not reactive

8af29cc

add(TokenInCollection.vue): show cart item skeleton while loading

65aea48

ref(GalleryItemTradesTable.vue): offers naming to trdes

d56226c

fix(SearchInput.vue): input styles

a9d3e42

fix(swaps): send item copy

3f2c618

feat: Add TokenInCollection component to TypeSwap.vue.

bc14d25

fix(TokenInCollection.vue): hide search input for owner of token

cc10f5f

ref(TradeOverviewModal.vue): force reset of child components on modal…

9ed0c19

… open

Merge branch 'main' into issue-11116

95416e5

# Conflicts: # composables/useTrades.ts

hassnian changed the title ~~feat: Collection offer~~ feat: Collection Atomic Swaps Jan 7, 2025

hassnian changed the title ~~feat: Collection Atomic Swaps~~ feat: Accept Collection Atomic Swaps Jan 7, 2025

hassnian added 7 commits January 7, 2025 18:48

add(TradeOverviewModal.vue): missing send item events and prop

e0eadd5

ref(TradeOwnerButton.vue): hide counter swap button for collection swaps

e40fc4a

Merge branch 'main' into issue-11116

b010710

fix(TokenSearchInput.vue): search item results styles

137d9a6

ref(TradeOverviewModal.vue): unify content of modal based on types

8bbafd2

- ref: removed duplicate code

ref(TokenSearchInput.vue): remove any

b592c81

ref(TradeFilter.vue): plurar translation

a110ddc

hassnian requested review from preschian and Jarsen136 January 8, 2025 08:44

hassnian marked this pull request as ready for review January 8, 2025 08:44

hassnian added 3 commits January 27, 2025 17:15

fix(WalletAssetTrades.vue): remove duplicates pushing adding trades

bfb0fc1

fix(WalletAssetTrades.vue): items overflowing from container

f20e038

fix(swaps): deepscan issues

ea35e6d

Merge branch 'main' into issue-11116

eaf9c2a

# Conflicts: # components/common/ConnectWallet/WalletAssetMenu.vue

Merge branch 'main' into issue-11116

39c07ea

preschian approved these changes Jan 30, 2025

View reviewed changes

fix(GalleryItemTradesTable.vue); nested vue lifecycle hooks not working

73df8f4

hassnian added 2 commits February 3, 2025 12:03

fix(GalleryItemTradesTable.vue): can't open trade modal from gallery …

04176f0

…item

fix(trades): edge cases for floor price calculation

a7ccfea

hassnian mentioned this pull request Feb 3, 2025

feat: New swap tables & Swap Modal follow up #11389

Merged

6 tasks

chore: trigger build

8d9d01a

preschian mentioned this pull request Feb 5, 2025

feat: Collection Atomic Swaps support #11394

Merged

Jarsen136 approved these changes Feb 5, 2025

View reviewed changes

Jarsen136 added this pull request to the merge queue Feb 5, 2025

Merged via the queue into kodadot:main with commit 9cf1279 Feb 5, 2025
41 of 42 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Collection Atomic Swaps support #11319

feat: Collection Atomic Swaps support #11319

hassnian commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

vikiival commented Jan 27, 2025

hassnian commented Jan 28, 2025

hassnian commented Jan 30, 2025 •

edited

Loading

preschian left a comment

Jarsen136 commented Feb 2, 2025

vikiival commented Feb 2, 2025

Jarsen136 commented Feb 2, 2025

hassnian commented Feb 3, 2025

vikiival commented Feb 3, 2025

preschian commented Feb 4, 2025

sonarqubecloud bot commented Feb 4, 2025

hassnian commented Feb 4, 2025

Jarsen136 commented Feb 4, 2025 •

edited

Loading

preschian commented Feb 5, 2025 •

edited

Loading

preschian commented Feb 6, 2025

feat: Collection Atomic Swaps support #11319

feat: Collection Atomic Swaps support #11319

Conversation

hassnian commented Jan 1, 2025 • edited Loading

PR Type

Context

Screenshot 📸

Accept Collection Atomic Swap

Offer tab in Collection

Incoming Trades & Create swap tab

netlify bot commented Jan 1, 2025 • edited Loading

✅ Deploy Preview for koda-canary ready!

netlify bot commented Jan 1, 2025 • edited Loading

✅ Deploy Preview for polkadot ready!

vikiival commented Jan 27, 2025

hassnian commented Jan 28, 2025

hassnian commented Jan 30, 2025 • edited Loading

preschian left a comment

Choose a reason for hiding this comment

Jarsen136 commented Feb 2, 2025

vikiival commented Feb 2, 2025

Jarsen136 commented Feb 2, 2025

hassnian commented Feb 3, 2025

vikiival commented Feb 3, 2025

preschian commented Feb 4, 2025

sonarqubecloud bot commented Feb 4, 2025

Quality Gate passed

hassnian commented Feb 4, 2025

Jarsen136 commented Feb 4, 2025 • edited Loading

preschian commented Feb 5, 2025 • edited Loading

preschian commented Feb 6, 2025

hassnian commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

hassnian commented Jan 30, 2025 •

edited

Loading

Jarsen136 commented Feb 4, 2025 •

edited

Loading

preschian commented Feb 5, 2025 •

edited

Loading